projects
/
xen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3e4183a
)
[IA64] adjust ia64 xc_domain_restore() signature
author
Keir Fraser
<keir.fraser@citrix.com>
Wed, 27 May 2009 11:00:51 +0000
(12:00 +0100)
committer
Keir Fraser
<keir.fraser@citrix.com>
Wed, 27 May 2009 11:00:51 +0000
(12:00 +0100)
This patch fixes the following error.
ia64/xc_ia64_linux_restore.c:546: error: conflicting types for
xc_domain_restore
./xenguest.h:49: error: previous declaration of xc_domain_restore was
here
make[4]: *** [ia64/xc_ia64_linux_restore.o] Error 1
Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
tools/libxc/ia64/xc_ia64_linux_restore.c
patch
|
blob
|
history
diff --git
a/tools/libxc/ia64/xc_ia64_linux_restore.c
b/tools/libxc/ia64/xc_ia64_linux_restore.c
index 69f4e892503e073d0641ee872ca87df094737e2e..1e2d9a038fe66d68875f86d40aa90325879ea120 100644
(file)
--- a/
tools/libxc/ia64/xc_ia64_linux_restore.c
+++ b/
tools/libxc/ia64/xc_ia64_linux_restore.c
@@
-540,9
+540,9
@@
xc_ia64_hvm_domain_setup(int xc_handle, uint32_t dom)
int
xc_domain_restore(int xc_handle, int io_fd, uint32_t dom,
- unsigned int store_evtchn, unsigned long *store_mfn,
- unsigned int console_evtchn, unsigned long *console_mfn,
-
unsigned int hvm, unsigned int pae
)
+
unsigned int store_evtchn, unsigned long *store_mfn,
+
unsigned int console_evtchn, unsigned long *console_mfn,
+
unsigned int hvm, unsigned int pae, int superpages
)
{
DECLARE_DOMCTL;
int rc = 1;